From: Alexander Tsoy <alexander@tsoy.me>
Date: Mon, 27 Oct 2014 13:45:10 +0000 (+0300)
Subject: build: Workaround quoting issues in configure script
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1995
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b;p=gnome-shell.git

build: Workaround quoting issues in configure script

Default value of BROWSER_PLUGIN_DIR variable contains special symbols.
Thus quoting and inlining it in parameter expansion is not portable.
In particular it does not work in dash. Replace ${a:-b} parameter
expansion with conditional statement.

https://bugzilla.gnome.org/show_bug.cgi?id=739241
---

diff --git a/configure.ac b/configure.ac
index d55848b7b..5b8c306ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,7 +232,9 @@ esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+if test -z "${BROWSER_PLUGIN_DIR}"; then
+  BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
+fi
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
 AC_CONFIG_FILES([